added furatto
resolved merge conflict in gemlock, chunky_png??