Merged on changes from PicesKaggle