Customized annotation, fixed bug in freeroam
Merge remote-tracking branch 'origin/master'