respect NON_DEFAULT inclusion for primitive types
Merge pull request #30 from rwbergstrom/master

respect NON_DEFAULT inclusion for primitive types