Merge branch 'pr/n4_g-emerson'
Merge pull request #4 from gerrysousa/master

Merge master - gerry