Merged in https://github.com/eddiemachado/bones/commit/3c890005f03a97adab6c1c09f3318d8c938b89f6
Merged in https://github.com/eddiemachado/bones/commit/e409402c6d14feb2e79f276201accae0361dcf7b