fixed errors and added changes to smooth scroll navigation
Merge branch 'master' into gh-pages

merge with changes of master