Style changes 2
Merge pull request #67 from canzalon/develop

Style changes 2