Bug Fixes and Add License Strings
Bug fix
Merge pull request #7 from SMSG-MAC-DEV/2.2.0_DEV

Bug Fixes and Add License Strings