copying sources corrected and tested
Merge branch 'dev' into feature/autodetect_configuration