2.3.1
Merge https://github.com/TejasR/automated-tm-graphics

Few header files have been changed.