hadynz Merge pull request #127 from miharekar/patch-1