Merge pull request #67 from plieven/for-1.9.3