Clean up
Merge branch 'develop' of https://github.com/gortazar/optsicom-framework.git into develop