Merge pull request #29 from costaivo/master

Merged Changes From Master
Merge pull request #30 from costaivo/gh-pages

Merge pull request #29 from costaivo/master