davetayls Merge pull request #107 from LukasDrgon/patch-1