Merge branch 'release/1.3' into gh-pages

Closes #5