v0.2.1

Improved some code
Cleaned some code :)