fixed some issues based on feedback
Merge branch 'master' into gh-pages
New version