code style formatting
Merge pull request #2 from engstrom/master

code style formatting