Small fixes.
Bump version.
Merge pull request #22 from chrishumboldt/dev-chris

Dev chris