Cleaned up the code to fix bug #2519
Cleaned up the code to fix bug #2519
Merge branch 'develop' of https://github.com/IQSS/dvn.git into develop