ds_store
Fix
Merge branch 'master' into v0.5