Re-apply core option to switch out L and Z Part1
Re-apply core option to switch out L and Z Part2
Merge pull request #152 from Oggom/master

Add core option to switch out L and Z