Fixed line-endings and small bugfix for linux.