more if statements
Merge pull request #21 from shawnlknight/master

more if statements