Corrections.
PR ready for prod with changes.
Merge pull request #34 from Adron/gh-pages

Latest corrections.