Config changes
Merge pull request #6 from steveHaar/Development

Config changes