Merge pull request #7 from pixelwhip/style

More style fun
Merge remote-tracking branch 'upstream/master' into style