Issue #946 #947

Closed thiagobustamante closed 8 years ago