Merge pull request #114 from iongchun/fix-userdiff