Fixed #19.
Merge branch 'master' of https://github.com/TrackerProducts/TSM.git