Merge pull request #68 from plieven/for-1.9.3