AUR merge

#19