Coding style clean-up
Further clean-up
Merge pull request #18 from hananils/integration

Coding style clean-up