fix bug
Merge branch 'grady' of https://github.com/gsigler2/paragon-messenger into grady