Merge pull request #2 from A-Dechorgnat/master

back to wip
Merge pull request #3 from A-Dechorgnat/wip

Merge pull request #2 from A-Dechorgnat/master