Fixes and Closes #5

Reported by @rasjidw