Added shuffle and album support, Fixes #7 #9