Fixed #129
Merge pull request #130 from saidul/issue_129

Fixed #129