Additional to previous patch.
Merge pull request #62 from AntonGordienko/master

Additional to previous patch.