production ready
Merge branch 'master' of https://github.com/taylormadetraffic/TaylorMadeTraffic-CL