Merge pull request #67 from whereisciao/feature-tracking-class

Feature Tracking Class
Merge commit 'ef1d32c6b17bbd75b873051bfb7329ab56238d67'