Remove if statement
Merge pull request #639 from CharlieMarshall/master

Remove if statement