Fixed All Bugs in issue 1
Merge remote-tracking branch 'origin/Bug-Fixing'