Updated the version histroy
Merge branch 'master' into gh-pages