Merge pull request #6 from Fli-c/gh-pages

211
210 by subzey
203 by Fli-c
Merge pull request #1 from xem/gh-pages

Update from upstream