close #36
Merge pull request #37 from andriytyurnikov/issue_36_fix

close #36