Changed minor things
Merge remote-tracking branch 'origin/master'
Iteration 1-2 Final