MArin style
Merge pull request #2 from MarinSRC1b2/MarinoStyle

I'm the winner