Final cleanups. Closes #17 and releases v0.2