Update for version 0.2 and recommit of messed up pull request for 0.1.1