Some changes.
Merge pull request #1 from ja06muen/master

Some changes.