to merge...
Merge branch 'master' of https://github.com/DOOOOOM/jmpd-shared