Fix for Issue #12
Merge pull request #16 from ogalimov/master

Fix for Issue #12