5.2.1.3
5.2.1.3 + 5.2.1.4
some fixes
Merge pull request #12 from alexander-naumov/master

some fixes