Merge pull request #549 from tahashahid/patch-1