oyvindln Merge pull request #21 from akien-mga/pr-aur