Issue223 time table

Merge updates of CombiTimeTable for MSL 3.2.1 to master.
This closes #223