Fixed issues which mentioned on github