callback should also take err as one argument
Merge remote-tracking branch 'origin/master'