- Merge upstream Resolves #170