fix
Merge https://github.com/kamaikin/ideya