aded
Merge pull request #4 from kkralj1/develop

aded