Issue #997 #998

Closed thiagobustamante closed 8 years ago