X11 added default locations
Merge branch 'master' of https://github.com/thumaszz/ccore