Merged changes from github