Created by: mattclarke
Follow-up work for DM-943.
Added OSX warning and fixed formatting so it is CLION friendly.