CON-541
Merge pull request #3 from EugenGanshorn/master

CON-541