Merge pull request #106 from colincross/type_error

Fix error messages containing variable types