simplify everything
Merge pull request #2 from shama/new

simplify
Merge branch 'master' into gh-pages
deploy