ATM Support
DRE Support
Merge pull request #215 from Taverius/master

ATM, DRE support