Merge pull request #19 from acairns/master

Issue #18: Adding PHPUnit within require-dev in composer.json
Merge pull request #20 from duellsy/develop

Develop