master - added conditional parameter return values implementation