Merge pull request #2 from Karloid/master

Some refactoring
Merge pull request #3 from Karloid/master

Merge closely spaced points
Merge pull request #4 from Karloid/master

render water
Большое изминение.
Merge pull request #2 from GeorgeBely/master

Test pull request