Style changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from bexcitement/master

Style changes