Balanced things
Merge branch 'master' into gh-pages
Updating to 0.1.1