Changed switch to if statements
Merge pull request #5 from samuelfrench/master

Changed switch to if statements