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

Some changes.