PUBSTWO-1048 & 1083 - new fields
Merge pull request #95 from dsteinich/master

PUBSTWO-1048 & 1083 - new fields