Added new ATM to Pyrgos

Fixes #60
Merge remote-tracking branch 'origin/master' into BugFixingRound1