* Issue #16, fix handling of subdir creation