Merge pull request #18 from estelle/master

this sucks
Merge pull request #20 from estelle/gh-pages

added cons