Merge pull request #42 from Cerberus98/master

Fixes #41
Fixes some type semantics garbage