Updated changes from last gem release