Added editor
Merge pull request #1 from funvill/master

Added editor