trololo
Merge pull request #1 from MartinStrapko/master

trololo