Fix conflict
Merge pull request #53 from okada-takuya/remove_warning

Fix conflict