updated functionality
Merge pull request #35 from stas-tanko/stas

updated functionality