-Fixed several last minute issues
Merge branch 'master' of https://github.com/iomekam/GTSafe