danielinteractive Merge pull request #4 from TJaki/patch-2