Fixed deadlocks in Map.
Merge branch 'master' of https://github.com/voodooattack/ADWIF