Fix of Release version - should be polished.
Merge pull request #90 from l-korous/master

Fix of Release version - should be polished.