Some changes.
Merge pull request #1 from zarobaku/modify

Some changes.