fixed bug
Merge branch 'gh-page'
Merge branch 'gh-page' into master
merged gh-page into master