Merge pull request #380 from oneru/master