Merge master with v0.2-beta

- Merge the `master` branch into the `v0.2-beta` branch
- This had to be done because some files were accidentally committed into the `master` branch, and the changes could not be undone.