Merge pull request - 2

Merge all updates