Merge pull request #461 from negativeExponent/libchdr