Allow custom validation message to be passed in options object.
Added tests to check custom message behavior.
Return original error message.
Merge