Merge pull request #96 from kess78/patch-1