Added an endlessly looping version.
Changes for Mavericks compatibility.