v0.0.2 Rebase from master

Rebasing extension based off changes to master