Add shuffle mechanism
Merge pull request #21 from Amomo/master

Add shuffle mechanism