Merge pull request #283 from Mizux/master