ready for merge to mopcon.org

Signed-off-by: Mikimoto <mikimoto.c@gmail.com>