Package upstream 4.0.4

Fixes #1
Merge pull request #2 from xeqi/upstream-4.0.4

Package upstream 4.0.4