Merge branch 'master' into gh-page
merged master into gh-page
removed changes from last update
Merge branch 'gh-page' into master
merged gh-page into master