PUBSTWO-939 - very rough first draft
Merge pull request #93 from dsteinich/master

PUBSTWO-939 - very rough first draft