closes #264
Merge pull request #273 from rashidkpc/master

closes #264