Typo fix. Closes #115.
Merge branch 'master' into ordered_args