Just a few changes.
Merge remote-tracking branch 'origin/master' into Small_Changes
Merge pull request #17 from SW2A305/Small_Changes

Small changes