Some fixes.
Merge pull request #90 from mouseym/patch-2

Some fixes.