merged ptomulik/archlinux branche