Update to V1.2

had to restructur the code a little bit