sescandell Merge pull request #167 from mehmetsoylucom/patch-1