More updates as I work through with Thymely.
Merge branch 'master' of https://github.com/Gisleburt/Gisleburt