update marcos dalte, branch bug 200