Bug fix
Resolving conflict
Merge branch 'master' of https://github.com/WST/orifriend
Merge branch 'master' of https://github.com/WST/orifriend
Merge branch 'master' of https://github.com/WST/orifriend
Merge branch 'master' of https://github.com/WST/orifriend