Merge pull request #1 from GeorgeBely/master

Update
Cosmetic changes
Some refactoring
dots only placed on RMB
Merge pull request #2 from Karloid/master

Some refactoring