Merge pull request #358 from Sakitoshi/master