Dev

dev branch merge for training set fix