Fixed #16
Merge pull request #38 from rkkautsar/master

Fixed #16