Renamed project
Merge pull request #15 from VladVin/vlad-vin-branch

Some fixes