fix some errors and adding code
Merge remote-tracking branch 'origin/master'