Davids update af shuffle 2 ;)
Merge origin/master