Application fix
Merge branch 'master' of https://github.com/nighttrain0486/sample_app