richfitz Merge pull request #26 from richfitz/update-configure-include