Merge pull request #28 from Happydude11209/master

Name Fixes
added changes from gps tree into master branch manually