added full file paths
incorporated changes
added gps support
merged conflict