Merge Updates from veritrans-php