Implemented skipBaseFiles option; Fixed silly silly bug