Merge pull request #5 from gugek/master

Merge
Merge branch 'master' into gh-pages

Resyncinng from github