Merge pull request #16 from rednaks/master

[Multi] Last working commits
Merge pull request #17 from rednaks/master

Cleaning code Removing unused files