merged with beagleplayer, commiting final version