ATM Enhancement Merge

Fixes issue #93