solved issues from github