Version 2.3.0 and debug version fixes #6