Addresses #53

Now crashed when wrong keywords are used in COORDINATION SWITCH=...
Merge branch 'v2.0'