Fixes.
Bump to 0.4 with docopt fix and package changes.