Merge remote-tracking branch 'origin/master'
Decreased dot distance
code cleanup