Imported Upstream version 0.0.3.src
Merge tag 'upstream/0.0.3.src'

Upstream version 0.0.3.src