Changed order of arguments to produce a simpler API
Merge pull request #74 from peastman/master

Changed order of arguments to produce a simpler API