Fix double call-back issue
Merge branch 'master' into phonegap