minor patches
Merge branch 'master' of /Users/parfunc/continuous_testing_setup