Build #228:   Merge e5c7ff4ac4271a102b003e86a31df7788106fd36 into 26e3d6b5c42a3b41001a4e51d1e0548671a... on branch better_error_handling almost 5 years ago

Build #3:   Re-organised to make more sense. Added tests, run phpunit to run the tests on branch master about 9 years ago