refactor names to follow PEP 8.   fixes #18
Merge remote-tracking branch 'origin/master'

* origin/master:
  refactor names to follow PEP 8.   fixes #18