Need to copy dsm_init.h to /usr/include too
 merge dev into master