Merge pull request #15 from feomike/master

Contribution request