bug fixes after merge
Merge pull request #49 from nastysloper/bug-fixes

bug fixes after merge