Format code
Merge pull request #1 from srenault/master

Format code