Updated sample
Merge branch 'master' into sample
Fixed phpunit.xml