Added support for shorts, added better error handling.
Updated type handling to allow inheritance (bugfix).
Added new test variables. Made tests a little bit more exact.