Merge pull request #94 from d1b/release_3.141560