Merge pull request #12 from PredictionIO/master

merge back from master