many improvements in design
fix conflict
Merge branch 'master' of github.com:spyl94/znieh