config changes
Merge pull request #40 from SuperstarDonkeyJockey/master

config changes
resolve conflicts