Merge pull request #1 from blueyed/master

Some more bundles
Fix CR/BS mappings via My_CR_map/My_BS_map