Fix type references
Merge pull request #123 from raymondfeng/master

Fix type references