Merge pull request #26 from minakov/improve-phpunut

Improve phpunit