Merge pull request #43 from MarkTonkinson/master

Early morning stuffs