Changed and updated
Merge branch 'master' of github.com:/jwcrawley/3D-scanner

fixed