Merge git+ssh://git.asbjorn.biz/rapper