style
Merge pull request #1 from msiedlarek/master

Some coding style enhancements