Merge pull request #52 from okada-takuya/remove_warning

Remove warning
Fix conflict