refactored if expression
updated to version 0.0.2
merged branch 'v0.0.2'