Merge branch 'gh-pages'
removed address for now
complie
Merge branch 'master' into gh-pages