Version 5.2.3, Fixes #16