applying bugfix from insalmo-fa (closes #88)
newline to unix
merging changes