Mno-hime Merge pull request #12 from Mno-hime/merge_upstream_20190105

Merge upstream changes 20190105

Latest commit e529bf6

Jan 6, 2019