removed duplicate callback when async===true (solves #89)
Merge branch 'master' into 1.x