Merge pull request #1 from gdg-x/master

update from master