Mac corrections
Merge pull request #1 from TrustedCryptos/master

Mac corrections and gui fix