Merge upstream changes, update README.md (new maintainer for Archlinux)
Bump version to 1.0.1-5
Fix fix fix