fix for issue  #159
Tweaks for fix issue #159
Preperations for Google Music App