Merge pull request #45 from NamTThai/master

Merge from master
Merge remote-tracking branch 'origin/dmg_calculator'