BUG Fix issues in master
Merge pull request #31 from tractorcow/pulls/fix-master

BUG Fix issues in master