Merged configure file from docs branch to master