Merge pull request #2 from miljaus/master

my change Im miljaus
Merge pull request #1 from homerfs/master

Merge pull request #2 from miljaus/master