Merge pull request #36 from roignac/master

Eradicate remains of CamelCase