added move support
fix line endings