Merge pull request #244 from paulusmack/master