Merge pull request #260 from paulusmack/misc