Merged pull from github