Update for compatibility with newer versions of tensorflow and numpy#38

tphlru wants to merge 2 commits intoxliucs:mainxliucs/MTTS-CAN:mainfrom

tphlru:maintphlru/MTTS-CAN-new:mainCopy head branch name to clipboard