Merge pull request #68 from Sopor-/patch-1