Enhancement: Closes #388
- made the required adjustments
Merge branch 'develop' of github.com:ist-dsi/fenix into develop