Made sure the right parameters are defined and reconized.
Merge pull request #9 from keesschepers/master

Made sure the right parameters are defined and reconized.