Merge branch 'pb/configure'