Merge pull request #231 from paulfelix/master