upgrade to 4.1

please review @eleith