A few minor fixes, related to issue #3

Fixes #3
Hi @diranged , I updated this as you suggested.