commit from think pad
merge from github