mushishi78 Merge pull request #5 from erlend-sh/patch-1 …