Restore master to 0.2.2 features

Since the reset to 0.1.5, the master branch lacks all feature PR's done by @stupidisum. At the moment there is no branch reflecting the npm published version. Develop should be updated accordingly to merge it into master.
