Version 5.3.0 Fixes #17