This is another PR

This is another PR. It's for TEST-29 (#54)