commented out manual temperature setting in one_shot
Merge branch 'matrix_test' of https://github.com/agnwinds/python into matrix_test
Merge branch 'matrix_test' of https://github.com/agnwinds/python into matrix_reorganise