Merge branch 'master' into gh-pages
adjusted responsiveness
Merge branch 'gh-pages'