Updates for q2
Merge branch 'master' of https://github.com/DaMSL/K3-Core