Merge Pull Request #251