Merge pull request #562 from larryho5/development