commit by Jake
Merge branch 'master' of github.com:pvtech/batch2_testgit