Merge pull request #1207 from davvid/pynsist