Added some new cool stuff for upcoming version v0.0.2 :)