Merge pull request #1 from CMAP-REPOS/master

Merge updates