Merge
Merge pull request #17 from km4054/master

Merge od Simona