The latest version 10.12.1 of mac os gives you this option. In modifier keys in keyboard preferences.