[Fix] Issue #102
Merge pull request #103 from popox/issue-102

[Fix] Issue #102