Merge branch 'develop'
Bump PHPUnit to 4.0
Fix typo
Merge pull request #212 from driesvints/patch-1

Bump PHPUnit to 4.0
Merge pull request #211 from jeremyworboys/patch-1

Fix typo
Merge branch 'master' into develop