commented some lines #35
resolved merge problems