product config and load updates
merging
Merge branch 'master' into testing
cleanup
Merge pull request #4 from DavidZey/testing

Testing