Merge pull request #2 from Zbob750/master

Miscellaneous Tweaks
Generated configuration using addDefault