Merge pull request #6 from MarkTonkinson/master

Mark's First Merge