Move a TODO to issue #14.
Merge branch 'next'
Bump to v0.4 for release.
Bump to next development release.