Merge pull request #6 from zn4ke/master

del conform and cosmetics