Fixed test case and added a more idiomatic example using a furure callback
Merge remote-tracking branch 'origin/master'