Ticket 2 fixes #2
Merge pull request #5 from DScheglov/ticket02.0.0.2

Ticket 2 fixes #2