Fixing else conditions
Merge pull request #2 from mdamour1976/master

Fixing else conditions