Added cool features

Committed from iPhone - Commited with Jackalope (http://jackalope.me)