Refactor bindings
Merge pull request #1610 from DavidRagazzi/refactor_bindings

Bindings refactored