Merge Pull Request #11