Fixed #21
Merge pull request #15 from umpirsky/fix/21

Fixed 21