reverted last changes
Merge branch 'binding_v2' of github.com:bcdev/beam into binding_v2