Merge pull request #1 from astirpe/master

Minor source improvements
Merge pull request #1 from isasrl/master

Merge pull request #1 from astirpe/master