Resolved 201-4 and fixed major bug in edit mode
Merge pull request #203 from jcadek/master

Resolved 201-4 and fixed major bug in edit mode