Reviewed and formatted code according to coding standard.
Merge branch 'master' of https://github.com/cogneco/ooc-unit