Merge branch 'fix-34'

This fixes the callback parameters.
Conflicts were caused because of whitespace.