Upgrade to Foundation 5.4.7
Fix #16
Fix #11, #17