CON-462
Merge pull request #29 from EugenGanshorn/master

CON-462