think the tests should all work now...
Merge branch 'master' of https://github.com/Seraphiana/SML