ans tracking bugs fix
Merge branch 'master' of https://github.com/Nat-D/konnect