Merge pull request #12 from mind1master/master

added mapping support and suggest