v0.0.4 Rebased from master extension.

v0.0.4 Rebased from master extension.