0.2.0-dev

* Cleaner formatting
* Bug fixes