Dev to master v0.3-beta.1