Added return
Merge pull request #154 from eah13/gh-pages

Added return
Merge pull request #3 from silshack/gh-pages

Adding Elliot's fixes