Merge pull request #14 from samsmu/rework-custom-fields Reworked custom fields
Merge pull request #10 from samsmu/display-options-fix Fixed bug with populating display options