Merge upstream
Rebuild, version 0.0.2