Merge pull request #17 from costaivo/master

Merged Changes from master
Merge pull request #27 from costaivo/gh-pages

Merge pull request #17 from costaivo/master