Merge pull request #1 from zn4ke/dev

Dev
Merge pull request #2 from zn4ke/dev

Dev
Merge pull request #3 from zn4ke/dev

fixes
Merge pull request #4 from zn4ke/dev

del conform and cosmetics
Merge pull request #5 from zn4ke/dev

del conform and cosmetics
Merge pull request #6 from zn4ke/master

del conform and cosmetics
Merge pull request #7 from zn4ke/dev

Merge pull request #6 from zn4ke/master
Merge pull request #8 from zn4ke/master

fixes