Committing updates to the php2 project