Merge pull request #749 from TaiSHiNet/master