#659 code clean up
Merge branch 'master' of https://github.com/maqetta/maqetta.git