Merge pull request #55 from badnack/development

Development
Merge pull request #57 from badnack/development

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