Merge pull request #6 from jpoutiai/master

Coding style and code hardening