Minor improvements
Merge pull request #4 from fcduarte/general-improvements

Minor improvements