Merge pull request #122 from glenwks/master

updates to edit round
Merge remote-tracking branch 'upstream2/master'