Merge pull request #55 from badnack/development

Development
Merge pull request #57 from badnack/development

minor fixes
fixed typo
Merge branch 'development'
Merge remote-tracking branch 'upstream/master'
cleaning
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development'
Merge pull request #58 from badnack/master

merging