Merge pull request #232 from dmwit/master