minor work
Merge branch 'master' of https://github.com/jgauffin/Griffin.Framework