changes
Merge branch 'configure'