Consistent logic everywhere..
Merge pull request #257 from am11/master

Consistent logic everywhere..