Some changes
Merge pull request #1 from mzerter/master

Some changes