fix
Merge branch 'master' of https://github.com/Haneda/in-the-vicinity-cc
Merge branch 'master' of https://github.com/Haneda/in-the-vicinity-cc