Updates & Bug Fixes
Merge pull request #16 from SMSG-MAC-DEV/2.5.0_Beta_2

Updates & Bug Fixes