Previous changed incorrect. internal defaults need to added first so as not overwrite user defined defaults from file
Merge pull request #153 from Randgalt/master

Previous changed incorrect. internal defaults need to added first so as ...