code tweak
folders
parsing
Merge pull request #1 from maryhipp/master

Pull request for JoElla