Fixed -no-vars and added -files option

Now with tests!