Updated the version number
Merge branch 'refs/heads/develop' into gh-pages