merged in github change and ds_store