Initial commit and upgrade features from shuffleMe repo