CONN-256
Merge pull request #31 from elliemental/master

CONN-256