Added a few changes. Needs to be revised tomorrow.
Merge remote-tracking branch 'origin/master'