Fixed arg/kwarg order
Merge branch 'master' into patch