Merge pull request #1 from christran/master

Fixes
Fix
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge pull request #2 from christran/gh-pages

Fixes