Merge pull request #1 from GlobalNOC/master

master branch merge