fixed #285
Merge branch 'devel' of github.com:devsnd/cherrymusic into devel