bump from2

This PR bumps from2 to the latest version which contains a couple of fixes.