Fixes #2, fixes #3, fixes #4
Release 0.6.0