Merge pull request #25 from Neo139/patch-6