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

tarsier.uri.*
Merge branch 'gh-pages'