Peter's code
Merge pull request #1 from jozozchrenovej/peter

Peter's code