Merge pull request #59 from badnack/development

Development
Merge pull request #60 from badnack/development

Development
Merge pull request #61 from badnack/development

die hard!
Merge remote-tracking branch 'upstream/development' into development