extend and behavior based
Merge branch 'master' of https://github.com/ssavajols/my_marionette