setup tracking

include tracking
and fixed typo
Merge pull request #39 from Conver/master

setup tracking