Merge pull request #45 from fulme/gh-pages

merger