Merge pull request #11 from roman-yagodin/master

Update testing to follow master
Merge pull request #12 from roman-yagodin/testing

Merge pull request #11 from roman-yagodin/master