Merge v0.2-beta Branch with Master Branch

Merged the `v0.2-beta` branch with the `master` branch, so they would be identical