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

WAP minor changes