Merge pull request #5 from costaivo/master

Fixes related to description
Merge pull request #16 from costaivo/gh-pages

Merge pull request #5 from costaivo/master