General tidy up.
Merge pull request #1 from michaelw90/patch-1

General tidy up.
Merge pull request #2 from michaelw90/master

General Tidy Up