Better way to check for map entries
Merge branch 'LucentW-master'
Merge pull request #2 from Hamcha/master

Merging additional commits by Hamcha