More changes.
Merge branch 'master' of https://github.com/jmlassen/dingo
Merge branch 'master' of https://github.com/jmlassen/dingo