Fix a few things.
Merge pull request #24 from mayoz/master

Fix a few things.