Merge pull request #1 from jr-jaguar/master

dsds
config