Forgotten a merge
Tag v1.0.4