Merged in https://github.com/eddiemachado/bones/commit/53d715584188babc169346230def759582e2365a