handle wrapper...
Merge branch 'feature/refactoring_issues_#6' into develop