Merge pull request #3 from connyay/master

merge into gh-pages