Closes #426
Merge pull request #428 from rashidkpc/issue426

Closes #426