Fixed parameter list bug
Merge branch 'master' into async