This looks fine on inspection, and built on both ubuntu 32 and 64 bit systems -
14.04 and 16.04, respectively.

It's not in the review queue yet, so I don't know if there was more work you
wanted to do?  If not, I'd say go ahead and merge it.