Merge pull request #3 from zaycev/prod

Prod
tag
merge conflicts resolved