Merge pull request #4 from MarkTonkinson/master

Merge pull request #1 from KorySumsion/master
Merge pull request #2 from KorySumsion/master

Merge pull request #4 from MarkTonkinson/master