Merge branch 'use-callbacks-for-behavior'

Fixes #18