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

211
210 by subzey
203 by Fli-c
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages