pakozm Merge pull request #51 from msva/patch-1