Merge branch 'gh-pages'
fixed bounds
Merge branch 'master' into gh-pages