changes for better testing stuff
Merge branch 'master' into arrowhead