Added check on sourcefolder
Merged