Fixes #22. Fixes #3.

Start 0.6.0 development.
0.6.0
Merge pull request #24 from jmdobry/0.6.0

0.6.0