Merging in commit https://github.com/eddiemachado/bones/commit/099f0a5f69a17be4840d7a0380163c512d646713