Some fixes
Merge branch 'master' of github.com:GPGTools/GPGTools_Core