Fixed #1102
Merge pull request #18 from LLK/issue-1102

Fixed #1102