fixed major and minor defects
Merge remote-tracking branch 'origin/team1-dev' into team1-dev