Correct argument names. Closes #34