Added some cool features for the v2.0 :)