rename for clarity
remove unnecessary stuff
fix
fix
Merge pull request #7 from danbender/gh-pages

fixes