Updated configure with Brandon Schaefer's changes