another attempt to map bundle. properly namespaced and backward-compatible
Merge pull request #15 from fippo/master

BUNDLE mapping