Merge pull request #33 from costaivo/master

Merged Code from Master
Merge pull request #37 from costaivo/gh-pages

Merge pull request #33 from costaivo/master