fix
Merge branch 'master' of http://github.com/kalectro/object_recognition