fixed issue #659
Merge pull request #702 from safiyu/issue5

fixed issue #659