Merge pull request #79 from g-ortuno/small-improvements

Small improvements