Fixed problem with PHPUnit
Merge branch 'release/v0.3'