Small improvements.
Merge pull request #1 from MSala/master

Improvements