Merge pull request #329 from am11/master

Code: Fixed condition