Merge pull request #1 from prizrak1609/master

Test new branch final
Continue test final
Merge branch 'final'