Merge pull request #33