local change
Merge remote-tracking branch '247git/master'
merger with visualization
fixed issue with canvas size