Merged pull request ps3mediaserver/master#85 (thanks, valib!)