Fix issue #136
Merge pull request #148 from graudeejs/issue_136

Fix issue #136