Added support for default overrides.  This fixes #42