Merge remote-tracking branch 'upstream/master'
Fix formatting
Merge pull request #5 from chadlung/master

Fix formatting