fixing order of args for api consistency. new keyword args should be added to
the end of the function arg list.
Merge pull request #470 from sjsrey/wsig

fixing order of args for api consistency.