Merged in https://github.com/eddiemachado/bones/commit/ad66757f1964392104eaef94c05acebac031422e