Bump to 2.3.1
Updated sources