merge https://github.com/marguerite/xmradio.git master branch