Updated parameter ordering as discussed in issue #27