code clean
Issue 7 - done
Merge branch 'feature/7-handlerset-matching-fix' into develop