modified files to new standart
Merge pull request #90 from MrPhantomT/master

modified files to new standart