tying up loose ends
Merge branch 'develop' of https://github.com/smaccm/smaccm into develop