Couple small fixes
Merge pull request #4 from Alex-van-der-Peet/master

Couple small fixes