Make the code more testable without requiring forking in PHPUnit
Merge branch 'release-0.1-alpha'