Code adapted for 2.3 release
Merge pull request #15 from marinaserranomontes/develop

Code adapted for 2.3 release