Editor Integrated
Merge pull request #1 from sriram-rao/master

Editor was integrated