modified if statement compare expression
Merge branch 'feature_20140312' into develop