Added some cool stuff for release 0.0.2 :)