Merge pull request #4 from zultron/master

Fixes for #3