config changes
Merge pull request #4 from kwern/configure

config changes