Merge pull request

Merging master