manual Merge Bluefox Pull Request #14