merge
merge
Merge branch 'master' of github.com:sixin-zh/torch