Merge pull request #1 from osdc/master

merge