Fix gps and cleanup
Merge pull request #2 from DerArtem/master

Pull DerArtem's Changes to CM10.1