Added shuffle and 'return to playing playlist' functionality.
Javadoc update.