some changes
Merge branch 'master' of git://github.com/ravinet/3D-Reconstruction