fix conditional bug
Merge pull request #20 from brucexin/master

fix conditional bug