Many changes. Update v0.1.1. Fixes #8, #18