v0.0.3 Rebase from master

Merging latest updates - 0.0.3