Use python names separated by underscore
Merge pull request #3 from frapp/master

Use python names separated by underscore