Updating the parser to be more like the original paper (and the Python implementation)
Updating PHP dependency to 5.4