Merge pull request #10 from TravisEvashkevich/master

Fixes and Feature #3