CONN-262
Merge pull request #34 from elliemental/master

CONN-262