Merge pull request #2 from deluda/dev-deluda

test merge to master