Looks for correct parameters
Merge pull request #11 from robot14g3/master

Looks for correct parameters