Fix compilation with Hspec 1.5
Added hexadecimal parsing.
Merge remote-tracking branch 'upstream/master'