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