Fix Some Bugs
Merge branch 'master' of https://github.com/sadeghboorooni/GroupA