enable tracking close #34
Merge origin/master