Merge pull request #120 from himedlooff/gh-pages

A new feature and some fixes