Merge pull request #52 from fulme/gh-pages

merge