Fix cond and add if
Merge pull request #11 from maggy96/master

Fix cond and add if