Upgrade to 3.1.1 and use new file extension