Adjustments
Merge pull request #6 from oromero/master

Adjustments