Merge pull request #267 from paulusmack/master