gps-fix
Merge branch 'development' of https://github.com/carka684/CDIO-TrapDevice into development