added munchkin tracking code

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge branch 'master' into development