merge xdg-base-dir to master

should fix #67