HERP ATM support
HERP DRE support
Merge pull request #23 from Taverius/master

HERP DRE/ATM support