#33 Require PHP 5.4
Merge branch 'master' into simplification