some fix
Merge pull request #6 from svetlov/new_branch3

some fix