Issue #1003 #1004

Closed thiagobustamante closed 8 years ago