A bit modification
Merge pull request #383 from ebraminio/master

Two little modification