Upgrade to latest worthwhile to address #220