Merge pull request #3 from CuriousG102/master

Merge fixes from master