updating to rivets ~0.6.0