tied up fat, if-else conditions
Merge remote-tracking branch 'origin/master'