Merge pull request #999 from malderete/master

Fixed #998