Merge pull request #118 from jerv13/master

Fix editor issue
Merge remote-tracking branch 'upstream/master'