Fixed type_var
Merge branch 'master' of https://github.com/Toad2186/cs164