Martin Yde - Added configuration settings