some effort towards [ticket:122] , needs tests
1 file changed