Small fixes so it can be run
Merge pull request #22 from broggi/master

Small fixes so it can be run