Fixes #158
Fixes #157
Merge branch 'master' of github.com:jbeard4/scxml-test-framework