fix for #2, merge file into defaults
Merge pull request #3 from englercj/master

Fix for #2, merge file into defaults