MOre changes
Merge pull request #2 from jlaudadio/develop

MOre changes