Merge pull request #1156 from melkecelioglu/patch-1