some changes
Merge pull request #39 from cordoval/cordoval-changes

some changes