Merge pull request #78 from megarocks/small_fixes

Small fixes
Merge pull request #80 from megarocks/small_fixes

Small fixes
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