Merging with updated version of PredictionIO