CONNECT-306 - Additional fields
Merge pull request #16 from compatibleone/Features/CONNECT-306

Features/connect 306