Merge pull request #34 from purplecabbage/RemoveSubdir