Merge pull request #203 from sdigit/patch-1