Code polishing
Merge remote-tracking branch 'remoteGit/master'

Minor fixes and code polishing
merged... Code polishing and minor fixes