Merge pull request #1 from silshack/gh-pages

Pulling in recent changes