Fix/last fm

closes #32