bug fixes
Merge branch 'half_tracking_feature' of https://github.com/msturla/ati2013 into half_tracking_feature
anda joya