code style
Merge pull request #1 from lukekarrys/master

code style