Updated to version 1.2.1

Release 1.2.1
Merge pull request #17 from yglushonkova/master

Sources from SVN