Merge branch 'develop' of https://github.com/wkodate/BPS into develop