Added conditional
Merge pull request #39 from deiga/patch-3

Added conditional