fixes for #2
Merge pull request #4 from blackmenthols/issue2-fixes

fixes for #2, which can be merged now.