Merge pull request #3 from TravisEvashkevich/master

Fixes and Features