Merge pull request #13 from mredar/master

Refactor for edit namespace