Merge branch 'develop' into configure
Update configure script
Merge branch 'configure' into develop