measured a lot :-)
added equality and fixed some stuff and draw
Merge remote-tracking branch 'upstream/master'
merge