fix vars
some fixes
File.basename
Merge pull request #5 from Cepnoy/master

Fix