adding assertion that both data and ballback be supplied
Merge remote-tracking branch 'origin/master'