Merge branch 'devel'
Merge branch 'master' of https://github.com/MetalPhaeton/sayuri