ATMproject v.2.1

Functional extension. Bugs fixed.