Resolving conflicts
Merge pull request #12 from adorilson/master

Resolving conflicts