Missing commas as per #160
Merge branch 'dev' into ms