Merging v0.2

* Fixed known bugs
* Added coverage