thnx @armin-hackmann
Using phpunit 4.1
Merge branch '2.0'