formatting
Merge pull request #53 from silky/master

formatting