Release - v0.2.1

* Misc. changes