julien-duponchelle Merge pull request #78 from noplay/noplay-patch-1