Simplified if statement
Simplified another if statement
Merge pull request #18 from brockboland/dupe

Simplified if statement