use non-recursive mappings to prevent potential error
Merge pull request #98 from ppwwyyxx/master

Use Non-Recursive Mappings to Prevent Potential Errors