code refactoring
Merge branch 'master' of github.com:iSvB/nahleb
refactoring