Fixed mismatched guard clauses.
Merge pull request #2 from sgur/fix_mismatched_guard

Fixed mismatched guard clauses.