update
Merge pull request #1 from A-Dechorgnat/wip

wip integration
Merge pull request #2 from A-Dechorgnat/master

back to wip