IMP Allow folder in context
Merge pull request #18 from totaler/context_folder

IMP Allow folder in context