Merge pull request #2 from A-Dechorgnat/master

back to wip