-Simplify code
- Fixed string comparison operation
Merge remote-tracking branch 'upstream/master'