formatting
Merge pull request #117 from ryn0/master

formatting