Add findinmap support
Merge pull request #3 from tongueroo/findinmap

Add findinmap support