Merge Pull Request #11 -- master up to speed