Merge remote-tracking branch 'origin/master' into small_fixes
#73 When DMP and CMP are not an integer we have not correct data. Systems details
Merge pull request #83 from megarocks/small_fixes

Small fixes