Merge pull request #2 from zaro0508/bring-up-to-date

Bring up to date with Gerrit master