Changes to reflect rock coding style
Merge pull request #601 from shamanas/master

Changes to reflect rock coding style