Updated virtual fields to for changes of June 4
Merge pull request #69 from timrichardson/virtual_fields_v2

Updated virtual fields to for changes of June 4