updated some changes
Merge branch 'gh-pages'