Fix for Issue #17
Merge pull request #18 from ogalimov/master

Fix for Issue #17