In #8 to fix issue #7 broken code was committed. The fix for the broken code is to simply insert the missing 'and' in the changed if statement which this commit does.

Signed-off-by: David Black <dblack@atlassian.com>
Merge branch 'fix_for_broken_changes_from_issue_7' into modifications