Merge pull request #2 from mkawalec/master

Some corrections to function names and removed unneeded code
Remove unneeded condition
added param matching