Upgrade to v. 3.1.1