dawbarton Merge pull request #12 from tmr232/patch-1