merging
Merge pull request #7 from Vorskabobble/Editor

merging