Version 2.3.1 with minor fixes