Improved formatting
Even more fixes!
Merge pull request #2 from IonicaBizau/patch-1

Improved formatting