Master detail by titu00

Hello Jason, Changes made by titu00 is ok. can you merge the changes with your master?