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