Upgrade to 5.3.1 - Fixes #19 - Fixes #20