Proper Version Number
Merge branch 'gh-pages_develop' into gh-pages