Merged configure file from master