Pull request that fixes #225