fixed parameter for shuffle & fshuffle
Merge branch 'develop' into release