Merge pull request #3 from gutza1/master

Major Refactorization
Merge pull request #1 from alexalex9999/master

Merge pull request #3 from gutza1/master