Editor suggestions.
Merge pull request #716 from umaar/editor-updates

Editor suggestions.