Closes spine/spine#226