Fixing bugs
Merge branch 'master' of https://github.com/MIT-ITESM-2014/gps_mit