Bugfix: missing comma prevents parsing
Bugfix: type mismatches
Bugfix: magic number to prevent crashing on interaction
Merge pull request #18 from lmeyerov/test-fixes

Test fixes