putting things in place for v0.4

fixes #2 and #3