Issue #995 #996

Closed thiagobustamante closed 8 years ago