MOD: windows line endings
MERGE: syntax fix