Change tracking
Merge pull request #4 from iceraj/develop

Better tracking