Fix CR/BS mappings via My_CR_map/My_BS_map
Merge pull request #2 from blueyed/master

Fix CR/BS mappings via My_CR_map/My_BS_map