Initial after integration commit
Merge pull request #1 from ihnat/master

Initial after integration commit