Property detection support added
Line endings bug, commit authorized by @tombruijn
Fix merge