Merge pull request #100 from abasyrov/master

More problem polishing
Polishing problems
Fixing file paths