Merge pull request #20 from andreil/master

CA-90801