fixed typo
cleaning
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #59 from badnack/development

Development