Merge pull request #6 from istrasoft/patch-1