v0.1.3-alpha

* Minor bug fixes
* Cleaner code