Just moved all the parameters up top
Merge branch 'master' of https://github.com/dlg0/kineticj