Merge pull request #3 from CuriousG102/master

Merge fixes from master
Merge pull request #4 from CuriousG102/development

Merge pull request #3 from CuriousG102/master