Merge pull request #2 from Alex1990/master

Merge pull request #1 from Alex1990/gh-pages
Merge pull request #3 from Alex1990/gh-pages

Merge pull request #2 from Alex1990/master