cleanup
added support for 'void' measure callbacks
parameters are now alphabetically sorted