Hotfix/change parameter order

Change the parameter order as discussed in issue #27.