Merge pull request #1 from jbaragli/develop

remove style
Merge pull request #2 from jbaragli/master

Merge pull request #1 from jbaragli/develop