#121 corrected parameter names in guards
Merge pull request #124 from adamralph/121

#121 corrected parameter names in guards