Merge pull request #55 from VittGam/patch-1