got rid of extra = bug
Merge branch 'master' into gh-pages