Merge pull request #19 from thiagosf/master

Merge pull request #2 from phocusinteract/master
Merge pull request #3 from phocusinteract/master

Merge pull request #19 from thiagosf/master