Fixes #2
Merge pull request #4 from BusTicker/Fixes-#2

Fixes #2