Merge pull request #11 from roman-yagodin/master

Update testing to follow master