Merge pull request #55 from badnack/development

Development
Merge pull request #57 from badnack/development

minor fixes
cleaning
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development'