Pull requests

Merge of multiple pull requests.