Merge pull request #1 from jayparadise/master

quick code cleanup
Merge branch 'master' into gh-pages
spelling
Merge branch 'master' into gh-pages