small code optimization
Merge remote-tracking branch 'masterproj/master'