Basically the same code with an if statement in Mock file
Merge pull request #1 from pisocrob/master

Basically the same code with an if statement in Mock