fixed configure
Merge branch 'master' into dev_sappo