Fixed the errors that Yerlan pointed out
Some minor changes
Merge remote-tracking branch 'refs/remotes/origin/master'