keijiro Merge pull request #36 from keijiro/2018.3