Merge pull request #32 from x56/master

Some minor fixes