Merge pull request #92 from moorereason/iss91

Fix default values for custom fields