Minor changes to 3.2
Merge branch 'master' of https://github.com/claudiaesteves/MIG2014-Trajectories