Some small performance and thread safety improvements
Fix for condition where user is not in the map
Spacing fix (Not used to working in tabs)
Merge pull request #15 from jentfoo/master

Some small performance and thread safety improvements