Fixes problems when editing objects
Merge branch 'master' of https://github.com/geekpgh/mastersproject.git