Changing the way control options are added to the to_map to see if that stops duplication of controls
Merge branch 'master' into google
Merge pull request #3 from thomasgwatson/google

Google