Merge pull request #1 from frankfzw/master

cr
Type system
resolve confilct