update from 5.16.0 to 5.20.1, current stable
Merge pull request #11 from grantbow/master

update from 5.16.0 to 5.20.1, current stable