Merge pull request #2 from shadym/master

ATM
Merge pull request #3 from shadym/atm

Merge pull request #2 from shadym/master