Add shuffle and repeat features #16