Merge pull request #141 from AlexanderFabisch/refactor_python_bindings

Refactor python bindings