Tracking and Tracing is enabled by default
Update from master
Merge remote-tracking branch 'upstream/master'
Merge pull request #42 from NadiaGamula/master

Tracking and Tracing is enabled by default #40