minor changes
Merge pull request #16 from gerardo-prieto/develop

minor changes