Merge pull request #1 from kallada/master

Update
Merge pull request #2 from kallada/master

Update
Merge pull request #3 from kallada/gh-pages

Update