Merge branch 'master' into gh-pages
v1.0.2

I hate bugs…
Merge branch 'gh-pages'