Fixed issue #406

b
Merge pull request #464 from safiyu/issuesnew

Fixed issue #406