Merge pull request #23 from Neo139/patch-4