Merge pull request #1 from gitlabhq/master

update