Simplified two if statements.
Merge pull request #6 from pjackowski/master

Simplified two if statements.