fixes #60
Merge pull request #72 from iBotPeaches/master

fixes #61