MIL-284,245 issue fixes
Merge branch 'master' of https://github.com/crdschurch/utilities