Merge branch 'master' of https://github.com/DaMSL/K3-Core
Merge branch 'master' of https://github.com/DaMSL/K3-Core
Script cleanup