Merge pull request #14 from p32424/gh-pages

merge