Merge pull request #69 from plieven/for-1.9.3