Merge pull request #161 from rsnel/master